luci-base: ui.js: order menu entries with the same weight by name

The previous server side menu rendering ordered items first by their order
weight value, then by their internal name.

Do the same for client side menu rendering.

Signed-off-by: Jo-Philipp Wich <[email protected]>

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index a6598355d67a217a03c6c788e06a0fe188fed913..91a93b9e9019e01d9147cc75052106563b8367a7 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -3053,7 +3053,13 @@ var UIMenu = baseclass.singleton(/** @lends LuCI.ui.menu.prototype */ {
                }
 
                return children.sort(function(a, b) {
-                       return ((a.order || 1000) - (b.order || 1000));
+                       var wA = a.order || 1000,
+                           wB = b.order || 1000;
+
+                       if (wA != wB)
+                               return wA - wB;
+
+                       return a.name > b.name;
                });
        }
 });